simplify merges and cs