Modify merge --no-ff alias to merge.ff false
Add pull rebase true to branch master