Try merging the two branches together!

    git merge <otherbranch>