Try to convert software surface directly when created
Merge conflicts
Try to remove the swap on software surfaces
--amend