Fix merge conflict leftovers