modifying for conflicts