Modify after conflict is solved