Don't resolve conflicts. Explore alternatives.
Open this page in a second tab and edit at the same time — both proposals will appear below as separate versions instead of overwriting each other.