diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index edcdc6ab7..309965d54 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -116,15 +116,7 @@ sub _drawQueryBuilder {
 		</td>
 		<td class="qbtd"></td>
 		<td class="qbtdright">
-<<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
-<<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
-		<input class="qbButton" type=button value=Add onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
-=======
 		<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)" $disabled></td>
->>>>>>> f32f209... Fix shortcut hoverhelp, javascript, and criteria builder usability.  Fixes bug #11516:lib/WebGUI/Asset/Shortcut.pm
-=======
-		<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
->>>>>>> 08b662b... Internationalize the Add button in the Criteria builder for the Shortcut.:lib/WebGUI/Asset/Shortcut.pm
 		</tr>
 		|;
 		$i++;