add plugin for threeway merge and change syntax for json