Fixed problems with Chai merge