fleet destination changed
fix conflicts