updated git config with conflicts and pr