merge conflict
browser helper changes
browser helper changes