changed merge conflict
browser and os classes methods