Unilever resolves pricing row in UK