helper conflict resolved again