merge two types of instructions
Merge branch 'master' of https://github.com/rattboi/0xBEEFA55