support scala
conflict resolution