Git Squash Commit After Merge