merge debian/log
fix checkout