Use --no-ff flag when merging into master