html edited
push command added
merge conflict fixed