Fix broken style-merging behaviour