Updated first post.
git imerge