DS-store changes, resolved conflicts