Added dennis to readme
Fix merge conflict