I don't know what that means. I haven't changed how I resolve conflicts with jj.