Preserve MC command list
Fix merge conflicts