Fix merge errors

* Somehow some merge errors snuck into the yaml file. Fixed those
* Also, initial (work in progress) commit of a script to check the
files against each other.