add ufo
add ship and sky file
fixing conflict