testing merge errors