templates added
Conflict resolved