Ship select and fixed merge conflicts