revised 'should' usage approach
fixing merge conflict