Git Merge Remote Master To Local Branch