Commit to sync
Conflict resolves