Error handling in parsers fixed
Error page template implemented
Conflicts resolved