Fix some incorrect merging in disasm, simulator