using flag --no-ff for merging