fixed issues with classes and other things, caused by conflicts/diff