change in tamplets.
Conflict resolve