Fixed conflicts detection.