Completed Template List to resolve Merge Conflict