some conflicts in parser need to be resolved