ready to sync
fixed merge conflicts