fixed dependecy conflicts
evaluation