Added option not to do analysis
Fixed merge