Update on classes
conflict merge