working SP sync
merged conflicts