Conflicting changes are highlighted in red. You can copy and paste them into the main page. When you're done, delete the ...