Added if statement to parser
conflict resolved