fix ess width resizing functions
clean up merge conflicts