Fixed git merge conflict push