fix merge conflict

Author: donmccurdy

packages/engine/Source/Renderer/TextureAtlas.js

@@ -678,29 +678,21 @@ TextureAtlas.prototype.addImage = function (id, image, width, height) {
     Check.defined("image", resolvedImage);
     //>>includeEnd('debug');
 
-<<<<<<< HEAD
     if (this.isDestroyed() || !defined(image)) {
       this._indexPromiseById.delete(id);
       return -1;
     }
 
-    const imageIndex = await this._addImage(index, image);
-    this._indexPromiseById.delete(id);
-    return imageIndex;
-=======
-    if (this.isDestroyed() || !defined(resolvedImage)) {
-      return -1;
-    }
-
     if (defined(width)) {
       resolvedImage.width = width;
     }
     if (defined(height)) {
       resolvedImage.height = height;
     }
 
-    return this._addImage(index, resolvedImage);
->>>>>>> 7167414aa1 (fix(billboards): Scale SVGs in texture atlas to match billboard display size)
+    const imageIndex = await this._addImage(index, image);
+    this._indexPromiseById.delete(id);
+    return imageIndex;
   };
 
   promise = resolveAndAddImage();