Uncomment kpr output
Fix merge conflict