chhe updates
chhe conflict res