Merge After Git Fetch Remote