new post: git merge 2013