icra format, abstract, etc
fixing conflicts