Change sync logic to both remove and add items