Resolved conflicts and JSLinted

objects.js

@@ -4085,15 +4085,19 @@ var re = /\((\d+)\)$/; // RegExp to match costume names
 SpriteMorph.prototype.newCostumeName = function (name) {
     var foundSameName = false,
         foundIndex = false,
-      lastIndex = 0;
+        lastIndex = 0,
+        i = 1,
+        p = null,
+        costume = null;
+
     for (i = 1; i <= this.costumes.length(); i++) {
-    var costume = this.costumes.at(i);
+        costume = this.costumes.at(i);
-    if (costume != null) {
+        if (costume !== null) {
             if (costume.name === name) {
                 foundSameName = true;
             }
             if (foundSameName) {
-        var p = re.exec(costume.name);
+                p = re.exec(costume.name);
                 if (p) {
                     lastIndex = Number(p[1]);
                     foundIndex = true;
@@ -4805,12 +4809,10 @@ StageMorph.prototype.blockTemplates = function (category) {
         blocks.push(block('setEffect'));
         blocks.push(block('clearEffects'));
         blocks.push('-');
-<<<<<<< HEAD
         blocks.push(block('doScreenshot'));
-=======
+        blocks.push('-');
         blocks.push(block('show'));
         blocks.push(block('hide'));
->>>>>>> master
 
     // for debugging: ///////////////