' (line 9, column 70) has a mismatched close tag at '' (line 9, column 84) MarkupStream: [markup = jar:file:/E:/Servers/onedev-8.0.15/lib/io.onedev.server-core-8.6.12.jar!/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.html wicket:panel

<wicket:fragment wicket:id="mergeFrag">
	<ul class="list-unstyled">
		<li class="mb-4">
			<div class="mb-2" From="" working="" directory="" of="" project="" em="" wicket:id="srcRepoName"></em>,
			check out source branch and merge with target branch</div>
			<div class="code">
				<div>git checkout <span wicket:id="srcBranchNameForCheckout"></span></div>	
				<div wicket:id="sameRepo">
					<div>git fetch origin</div>
					<div>git merge <span wicket:id="ffOption"></span> origin/<span wicket:id="destBranchName"></span></div>
				</div>
				<div wicket:id="differentRepo">
					<div>git pull <span wicket:id="ffOption"></span> <span wicket:id="destRepoUrl"></span> <span wicket:id="destBranchName"></span></div> 
				</div>
			</div>
		</li>
		<li>
			<div class="mb-2">Resolve merge conflicts, test changes and push result commit to OneDev</div>
			<div class="code">  
				git push origin <span wicket:id="srcBranchNameForPush"></span>
			</div>
		</li>
	</ul>
</wicket:fragment>
<wicket:fragment wicket:id="rebaseFrag">
	<ul class="list-unstyled">
		<li class="mb-4">
			<div class="mb-2">From working directory of project <em wicket:id="srcRepoName"></em>, 
			check out source branch and rebase to destination branch</div>
			<div class="code">
				<div>git checkout <span wicket:id="srcBranchNameForCheckout"></span></div>
				<div wicket:id="sameRepo">
					<div>git fetch origin</div>
					<div>git rebase origin/<span wicket:id="destBranchName"></span></div>
				</div>
				<div wicket: