for merging; edited edit.html
for merging