Fix conflicts during sync