Added parser
Updated stack
Fixed merge for stack