Git Merge Force Overwrite