merge with clone/modify commit