Remove unnecessary cleanup code
Some step implementations
Simpler branch names because we are now local
make more steps run
cleanup
Better step naming
Feature spec for conflict 1
Feature for ship conflict 2