Third possible merge conflict