fix collision w2
fix du spawn
fix du spawn - merge