I don't think the merge conflicts can be avoided.
If we wait for all progress branches to be merged first, than the person who does spacing will have to solve merge conflicts.
If spacing is merged before someone merges their progress branch, than person with progress branch will have to solve merge conflicts.