adapt to style changes after merge