fixing bugs removing conflicting classes