indent properly after merge