Template:Merge done

Merger complete