nasosi Resolved conflicts