icons and ship loaded
merge issues