redoing some git merge stuff