merge.html + fix edit form only when admin