test resolve conflit