Removing second html in file name.
Reformatting file headers.
Fixing merge conflict.