removed conflicts
removed codex from repository.