testing merge reset