git: add merge settings