added conky... didnt work
merge conflict