update to latest versions
fix conflict