[Thinh] Done template
[Thinh] Conflict solve