change tabs to spaces
merge