Git Merge Squash No Ff