Confilict removed