cs error on merge