merging style tweaks