Fix conflict post process code
Make keymap optional with k as default