solve conflicts 2