Made enemy ship shooting better
Resolved conficts