edit page for merge fixed 2