[CC-385] Fixed merge conflict