added git --no-ff opt to merge by default