topiclist
fix conflicts