Confict removed