Git Merge No Fast Forward