conflicts
conflicts
resolving conflicts and adjust the stories
conflicts
fixing error
Merge pull request #220 from DevYah/T5_jihan_5.1_adding_disease

T5 jihan 5.1 adding disease