jj-conflict