expand region
Fix conflicts¨