Another little fix to try to get a merge without a prompt to add a commit message