[ALOY-1023] Fix issue merging styles
Merge pull request #413 from skypanther/ALOY-1023a

[ALOY-1023] Fix issue merging styles