Fix merge conflicts - part 2