update docs
remove q
fix merge conflict