domx: define conflict fix