merge modification