First draft cv prototype design
Fix conflict