Fixing merge error

As a side note, turrets shoot now