revert to usable moveship
solved merge conflicts