Change create conflit
Resolve confict