Merge with --no-edit by default