Merge style into master