Merged both config files into one.
$ git checkout --theirs config.yaml