Fix multiple merge errors