Edit parser and views
Merge path