Fix yet another merge conflict