bytecode converter done
fixed conflict