small changes before manual merge