Git Bypass Automatic Merge Resolve