code recovered after conflict