Added akka-testkit and scalatest to the libraryDependencies
Comment test implementation out
Implemented conflict finding algorithm