copy all from djinni folder
fix conflict