fixing issues that caused CH tests to fail.
resolving conflicts