modified ipy nb
write grid search script
fix merge conflict