Added option to never use merge commit