resolving remaining conflict