Resolve pending sync and workspace conflicts

Stop making parallel edits. When a conflict appears, keep the devices and records identifiable. Additional edits make it harder to establish which profile, card, or environment was intended. Compare meaning, not only timestamps. Review profile identity, input values, card targets, environment source, wind call, and accepted-solution revision. A newer timestamp does not automatically make a record correct. Choose the authoritative source. Select the revision backed by the current rifle, match document, and observations. Preserve any competing revision that contains evidence you may still need. Recalculate after resolution. Once the intended inputs are active, create and review a fresh accepted solution before printing, exporting, or going to the line. Verify the other device. After synchronization settles, confirm both devices identify the same active profile, card, environment, units, and revision.

Do not resolve by familiarity alone. A familiar-looking elevation row can belong to the wrong ammunition, target list, or environment. Resolve the inputs and revision identity first.