Add --no-edit param for merge command