Merge Master with Parser