Confilcit resolved