Would you prefer that I rebase my work so this all stays in one commit, or will you squash them when you merge? Or no preference?