fixing weird git merge issue