added MergeTest. added package.scala