Fixed conflict, preparing file for parser, updated files, error fixes.