Resolve the botched merge conflict correctly