Git Merge Force Overwrite Master