Fixes some merging issues switching from 3 back to 2.