Revert "Remove merge conflict tag"

This reverts commit 65ee3d142fa04381c455bfab7514f326f083e553.