remove unwanted spaces, reduce diff, clean before merge