working on ship AI
fixed merge conflict
fixed space dust