merge court's changes