perfected edit page
fixed conflict