removed --no-ff from merge