merging small changes to sync