repair of consequences of merge