Fix merge errors part 2