trying to merge repository, error with new classes