ugh weird git merge issue