All confilicts resolved