Fixing another merge issue.
Fixing another merge issue.

simeonoff/zero-blocks,zdrawku/zero-blocks,Infragistics/zero-blocks,zdrawku/zero-blocks,Infragistics/zero-blocks,zdrawku/zero-blocks,simeonoff/zero-blocks,simeonoff/zero-blocks,Infragistics/zero-blocks