fixed conflicts
docker intergration