Untrack hgignore, 1 new problem solution, removed some duplicates.
merge