Merging Stlye Changes