project: Fix merge

cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java

@@ -91,11 +91,7 @@ public class ItemSpriteFactory
 		else if (item.boughtTemplateId != -1)
 		{
 			auxSpritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider,
-<<<<<<< HEAD
-					item.boughtId, quantity, border, shadowColor, false);
-=======
 				item.boughtId, quantity, border, 0, false);
->>>>>>> runelite/master
 			if (auxSpritePixels == null)
 			{
 				return null;

runelite-api/src/main/java/net/runelite/api/ObjectComposition.java

@@ -77,12 +77,12 @@ public interface ObjectComposition extends ParamHolder
 	ObjectComposition getImpostor();
 
 	/**
-<<<<<<< HEAD
 	 * Get the bitmask that contains information on which directions you can interact
 	 * with this object from.
 	 */
 	int getAccessBitMask();
-=======
+
+	/**
 	 * Gets the {@link Varbits} used to switch this multiloc, or {@code -1} if this is not switched by a Varbit
 	 *
 	 * @see #getImpostor()
@@ -98,5 +98,4 @@ public interface ObjectComposition extends ParamHolder
 	 * @see #getImpostorIds()
 	 */
 	int getVarPlayerId();
->>>>>>> runelite/master
 }