add edit page
before merge