For whatever reason, git seems to have a really difficult time resolving conflicts in YAML.

*****
Written on