private function removeResolvedConflicts() { foreach ($this->conflicts as $conflictPath => $conflict) { if ($conflict->isResolved()) { unset($this->conflicts[$conflictPath]); } } }