preparing sync
merged
cleanup