html edit
push command added
merge conflict fixed