add script to consolidate conflicted todo.txts