some clases added
solving merge