Strange merge errors