fix extension merge and add name and encoding conflict checking (#116)
fix extension merge and add name and encoding conflict checking (#116)

* fix extension merge and add name and encoding conflict checking

* fix comments

* uniform code's indentation
riscv/riscv-opcodes,riscv/riscv-opcodes