logic added
some html coding
fix unmerged files