resolved ns-conflict