style updates
merging