Improved-region-handling
conflicts