Happy parser completed; now need to resolve a recursive merge bug