More merge errors