added htop-osx
fixed merge conflict