started parser integration
fixed conflicts