min changes after merge