patient can now create preferences
patient preferences
fixed merge conflicts