merging
fix conflict
prepare to run spikeslab