verilog.py: conflict fix