conflict solved
another conflict solved
synced