conflict reolved