remove old comments
merge conflict fix