Turning off auto-merge