conflit changes
conflict is resolved