change some tabs to spaces
before merge'