fix issue CIT-343
fix conflict