Repairing conflict with features and fields