edit page for merge fixed 5