resolved offset vs no offset conflicts