Fix conflits and repair spider