solve conflicts 3