modified  edit.html
tried to debug edit.html
for password conflict
for merging