fix CIT-382
resolve conflicts