Fix merge conflicts.
Fix merge conflicts.

lijie121210/ResearchKit,wlads/ResearchKit,weijentu/ResearchKit,wlads/ResearchKit,QuintilesRK/ResearchKit,jarrelscy/ResearchKit,oliverschaefer/ResearchKit,zdw19840929/ResearchKit,oliverschaefer/ResearchKit,wlads/ResearchKit,jimmyti/ResearchKit,chb/ResearchKit,umerkhan-apple/ResearchKit,zdw19840929/ResearchKit,boland25/ResearchKit,umerkhan-apple/ResearchKit,DrGo/ResearchKit,shazino/ResearchKit,DrGo/ResearchKit,CaueAlvesSilva/ResearchKit,DrGo/ResearchKit,boland25/ResearchKit,shazino/ResearchKit,YuanZhu-apple/ResearchKit,pawisoon/ResearchKit,KaiCode2/ResearchKit,QuintilesRK/ResearchKit,shazino/ResearchKit,cnbin/ResearchKit,pawisoon/ResearchKit,cornellradiology/ResearchKit,chb/ResearchKit,oliverschaefer/ResearchKit,msdgwzhy6/ResearchKit,QuintilesRK/ResearchKit,jimmyti/ResearchKit,msdgwzhy6/ResearchKit,weijentu/ResearchKit,qualwas72/ResearchKit,boland25/ResearchKit,msdgwzhy6/ResearchKit,qualwas72/ResearchKit,weijentu/ResearchKit,md0u80c9/ResearchKit,weijentu/ResearchKit,qualwas72/ResearchKit,cornelltech/ResearchKit,danoli3/ResearchKit,mluedke2/ResearchKit,danoli3/ResearchKit,zhuzhengwei/ResearchKit,jeremiahyan/ResearchKit,jimmyti/ResearchKit,YuanZhu-apple/ResearchKit,md0u80c9/ResearchKit,danoli3/ResearchKit,zdw19840929/ResearchKit,jeremiahyan/ResearchKit,allen7wang/ResearchKit,msdgwzhy6/ResearchKit,lijie121210/ResearchKit,AlexanderMazaletskiy/ResearchKit,CaueAlvesSilva/ResearchKit,chb/ResearchKit,AlexanderMazaletskiy/ResearchKit,cornellradiology/ResearchKit,CaueAlvesSilva/ResearchKit,zhuzhengwei/ResearchKit,oliverschaefer/ResearchKit,YuanZhu-apple/ResearchKit,lijie121210/ResearchKit,jarrelscy/ResearchKit,cnbin/ResearchKit,lijie121210/ResearchKit,zdw19840929/ResearchKit,qualwas72/ResearchKit,cornellradiology/ResearchKit,zhuzhengwei/ResearchKit,mluedke2/ResearchKit,mluedke2/ResearchKit,zhuzhengwei/ResearchKit,AlexanderMazaletskiy/ResearchKit,chb/ResearchKit,jarrelscy/ResearchKit,YuanZhu-apple/ResearchKit,KaiCode2/ResearchKit,cnbin/ResearchKit,allen7wang/ResearchKit,allen7wang/ResearchKit,pawisoon/ResearchKit,md0u80c9/ResearchKit,jeremiahyan/ResearchKit,cornelltech/ResearchKit,CaueAlvesSilva/ResearchKit,boland25/ResearchKit,cornelltech/ResearchKit,md0u80c9/ResearchKit,umerkhan-apple/ResearchKit,KaiCode2/ResearchKit,cornellradiology/ResearchKit