user can upload a pdf resume to their cart
fix merge conflict