Merge After Git Commit