One more merge conflict
One more merge conflict

jeremiahyan/ResearchKit,boland25/ResearchKit,md0u80c9/ResearchKit,allen7wang/ResearchKit,boland25/ResearchKit,oliverschaefer/ResearchKit,chb/ResearchKit,chb/ResearchKit,oliverschaefer/ResearchKit,allen7wang/ResearchKit,YuanZhu-apple/ResearchKit,boland25/ResearchKit,weijentu/ResearchKit,YuanZhu-apple/ResearchKit,oliverschaefer/ResearchKit,weijentu/ResearchKit,mluedke2/ResearchKit,mluedke2/ResearchKit,weijentu/ResearchKit,KaiCode2/ResearchKit,weijentu/ResearchKit,YuanZhu-apple/ResearchKit,allen7wang/ResearchKit,cornelltech/ResearchKit,oliverschaefer/ResearchKit,mluedke2/ResearchKit,md0u80c9/ResearchKit,chb/ResearchKit,jeremiahyan/ResearchKit,KaiCode2/ResearchKit,md0u80c9/ResearchKit,boland25/ResearchKit,cornelltech/ResearchKit,md0u80c9/ResearchKit,KaiCode2/ResearchKit,chb/ResearchKit,cornelltech/ResearchKit,YuanZhu-apple/ResearchKit,jeremiahyan/ResearchKit