Git Pull Merge Overwrite