Site modifier conflicts should treat existing and proposed modifiers separately.  My typical workflow is to adjust the existing site model as needed to reflect existing conditions (survey data typically needs adjustment), and only then applying proposed site modifiers.  This means that there are often conflicts between site modifiers needed to correct the existing conditions, and site modifiers needed for the proposed design.