Fix: CIT-632
resolve conflict