Git Fetch Origin Master Merge