Merge selections while block selecting, store unmerged selections

This eliminates the need for merging the selections when drawing, and also fixes doing things to the selections while selecting