Finished classes page
Conflicts resolved