edit page for merge fixed 5
edit page for merge fixed 5