Merging master.html