Revert "Remove merge conflict markers"

This reverts commit 52cd10a8557ec33a6c32c76490a453392e4604bc.