git is telling me to do this
resolving merge conflict