Conflict solved, more templates added, TODOs.txt updated: