updation of the classes
resolve the conflicts