added browser check
fix merge
fix issues
add fixes
merge
merge