More config for merge
Merge remote-tracking branches 'refs/remotes/origin/master' and 'refs/remotes/origin/master'