Update formHelper.php

fix merge conflict