Thread:Shabook/@comment-32069077-20160131182933/@comment-112155-20160212234714

Excellent job indeed. Just change the Conflict template with the rest of them, and I'll manually fix the boxes below during the weekend.