Merge branch 'fix_shift_reduce_conflict' of https://github.com/udif/yosys