adding editor5Scala
merges
fixed merge