merge style changes