added --no-edit option to merge command