Adding Conflict for real this time