testing merge code