fix for cm merges