editted quickstart
fixed merge on 404