merging style changes