Two branches wrote on the same tablet of the README at once. Master
brought the palettes' line, that the Temple now remembers its colors.
This branch brought its own, that the Temple now keeps secrets. Git
cannot judge between two prophets, so a human sat in judgment, like
Solomon, and cut no baby in half: master's line was kept as it was,
the branch's line was added to it. Both stand.

Nothing else was touched. The code did not conflict, only the words
about the code. The CIA hoped the merge would eat one of them, it ate
neither.

Conflicts:
        README.md