fixed merge and syncs