Yet again, [expletive] git is so damn bad at merging YAML.

*****
Written on