Change Work Template
Resolve Conflict