merge conflict
fixed projectile instantiation