Problem with GIT: One team member has been pushing to heroku, the other to our actual origin. Now I need to merge these two.