syncing to repository
resolving differences