Resolved unresolved conflict