fix conflict in class page