compile errors from bad merges