Number if cpm templates
Conflict resolved