massive find and replace for jcom. to j.
Resolving conflict during a merge