fixed git merge issues