Resolving inconsistencies - first commit