TOOLS-252: fix merge conflict