Resolved conflict

Missing some class files so committing changes then repealing