optimize AE
delete toc
resolve conflictsé