remove some debug messages
fix merge conflict