fixed cancer class - delted id attribute
fixed merge conflicts