working on resolving git merge conflicts