Fix debian control to avoid merge conflict and remove tmp.cpp file that was accidentally added into branch