Git Pull Automatic Merge Failed Fix