merge changes from local jtc