Updated CV
Re-ordered CV
Fixed merge conflicts