Fixed a merge problem where class was not set public. Now the project is compilable again