Fix more conflicts

diff --cc scripts/entities.ent
index 944a2abfeb8172513e336d40c0f45b1765c7db8b,57c999ea25f7a302699025e2446c585fbb4a1de3..b8208cc41f076229a50fcbe50ca64a50188b165b
--- 1/scripts/entities.ent
--- 2/scripts/entities.ent
+++ b/scripts/entities.ent
@@@ -682,32 -697,6 +697,35 @@@ This is the only correct way to put key
  itemkeys MUST always have exactly one bit set.
  </point>
  
++
 +<point name="item_key1" color="0 .5 .8" box="-16 -16 -24 16 16 32">
 +SILVER key.
 +-----------KEYS------------
 +<color key="colormod" name="colormod">color of the key (default: '.9 .9 .9').</color>
 +<string key="message" name="message">message to print when player picks up this key.</string>
 +<model key="model" name="model">custom model to use.</model>
 +<sound key="noise" name="noise">custom sound to play when player picks up the key.</sound>
 +-------- SPAWNFLAGS --------
 +<flag key="FLOATING" name="FLOATING" bit="0">the item will float in air, instead of aligning to the floor by falling</flag>
 +---------NOTES----------
 +Don't use this entity on new maps! Use item_key instead.
 +</point>
 +
 +<point name="item_key2" color="0 .5 .8" box="-16 -16 -24 16 16 32">
 +GOLD key.
 +-----------KEYS------------
 +<color key="colormod" name="colormod">color of the key (default: '1 .9 0').</color>
 +<string key="message" name="message">message to print when player picks up this key.</string>
 +<model key="model" name="model">custom model to use.</model>
 +<sound key="noise" name="noise">custom sound to play when player picks up the key.</sound>
 +-------- SPAWNFLAGS --------
 +<flag key="FLOATING" name="FLOATING" bit="0">the item will float in air, instead of aligning to the floor by falling</flag>
 +---------NOTES----------
 +Don't use this entity on new maps! Use item_key instead.
 +</point>
 +
++
++
  <point name="item_vaporizer_cells" color=".3 .3 1" box="-30 -30 0 30 30 32">
  Instagib ammo.
  Always contains 5 (g_instagib_ammo_drop) shots.