at this point I'm down to deciding which specific commits to merge and