[SUITEDEV-2114] fix merge problems