saving changes done in class
fixing merge issues