Updated feature osha after merging the conflict