Aplly some fix for merge and explicitly specify type for std::max

config/spells/ability.json

@@ -35,7 +35,7 @@
 						"duration" : [
 						    "UNITL_BEING_ATTACKED",
 						    "N_TURNS"
-						]}
+						]
 					}
 				}
 			}

lib/mapObjects/ObjectTemplate.cpp

@@ -262,7 +262,7 @@ ui32 ObjectTemplate::getWidth() const
 	ui32 ret = 0;
 	for (auto row : usedTiles)
 	{
-		ret = std::max(ret, row.size());
+		ret = std::max<ui32>(ret, row.size());
 	}
 	return ret;
 }