merging style into dev