resolve merge conflict
yay fancy planet code, but not tested :(
cargo fix
other players added, we'll see if it works