Remove all conflicts in MParser.y