collection engine and sbt
merge fix