Visual Studio Git Merge No Fast Forward