Fix merge-command