Merge After Git Fetch Not Working