edit clone command
after conflict