Learning about conflicts
Fixed the conflict