Sync

Sync only
Solved conflicts