solve jison conflicts