ISSUE-85 fix bad merge