page-editor merge conflict resolved