resolve conflicts

core/assets/bundles/bundle.properties

@@ -583,47 +583,6 @@ error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
 block.unknown = [lightgray]???
-blocks.powercapacity = Power Capacity
-blocks.powershot = Power/Shot
-blocks.damage = Damage
-blocks.targetsair = Targets Air
-blocks.targetsground = Targets Ground
-blocks.itemsmoved = Move Speed
-blocks.launchtime = Time Between Launches
-blocks.shootrange = Range
-blocks.size = Size
-blocks.displaysize = Display Size
-blocks.liquidcapacity = Liquid Capacity
-blocks.powerrange = Power Range
-blocks.linkrange = Link Range
-blocks.instructions = Instructions
-blocks.powerconnections = Max Connections
-blocks.poweruse = Power Use
-blocks.powerdamage = Power/Damage
-blocks.itemcapacity = Item Capacity
-blocks.memorycapacity = Memory Capacity
-blocks.basepowergeneration = Base Power Generation
-blocks.productiontime = Production Time
-blocks.repairtime = Block Full Repair Time
-blocks.speedincrease = Speed Increase
-blocks.range = Range
-blocks.drilltier = Drillables
-blocks.drillspeed = Base Drill Speed
-blocks.boosteffect = Boost Effect
-blocks.maxunits = Max Active Units
-blocks.health = Health
-blocks.buildtime = Build Time
-blocks.maxconsecutive = Max Consecutive
-blocks.buildcost = Build Cost
-blocks.inaccuracy = Inaccuracy
-blocks.shots = Shots
-blocks.reload = Shots/Second
-blocks.ammo = Ammo
-blocks.shieldhealth = Shield Health
-blocks.cooldowntime = Cooldown Time
-blocks.basedeflectchance = Base Deflect Chance
-blocks.lightningchance = Lightning Chance
-blocks.lightningdamage = Lightning Damage
 
 stat.input = Input
 stat.output = Output
@@ -669,6 +628,9 @@ stat.ammo = Ammo
 stat.shieldhealth = Shield Health
 stat.cooldowntime = Cooldown Time
 stat.explosiveness = Explosiveness
+stat.basedeflectchance = Base Deflect Chance
+stat.lightningchance = Lightning Chance
+stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
 stat.heatcapacity = HeatCapacity