Silly merge error on config.yml