Add DOCTYPE
Merge