[ALOY-1023] Fix issue merging styles