testing merge and delete master