Removed the experimental parser, and added MERGE to the 2.0 parser