fixed conflict in TOC