testing merge and deleting master