parser integrated. Conflicts reolved