changed 2 loops resolving name conflicts for new tiddlers issue #294

This is the pull request you asked for.