.mine <span id="roundedBox" class="panel"> ======= <div id="mainPanel" class="rounded panel"> >>>>>>> .r2348 <img src="..." class="panelImage" /> <<<<<<< .mine </span> ======= </div> >>>>>>> .r2348 This is what Subversion (SVN) does to your files when it detects conflicts between your working copy and what it is pulling down from the server. It marks them