squash me into :control commit