Fix conflicts and compile errors.