10.5 Unresolved conflicts