Fix conflics
Fix conflics
nicki: remove nightmare