corrige conflit
add nosql compose