Reintroduce Fix merge-command