Adjustment to make merge work.