conflict reresolved