Merge After Git Commit Author