fixed the merge command