remove extra whitespace
merge identical changes