Made and edit to the page that conflicts with the other branch