synced a localdir
merged conflicts