template edit and create
Merge and resolve Conflicts