Fixed the autocomplete field for medications, now saves properly
removed merge conflicts, medication field fixed