Merge from parent (directory conflict for small_boat_crane, discarded the delete as it seems like this mesh is used on floating_city_3)