Confilicts resolved