Fix merge conflict, part 2