resolved latest conflict