Change git merge alias and allow no-ff (if needed)