added address location for opcodes
fixed conflict