confilict edited