@reset is this what you were looking at? That's a heredoc, not a merge conflict. I can't see it elsewhere...