add ship img
fix conflicts