Revert "improve position breaking algorithm"

I broke auto merging, hopefully this fixes it