refactored code
forced git commit
fixing a merge conflict