re-fixing merge omission
re-fixing merge omission


kuali/kc-rice,shahess/rice,ewestfal/rice,UniversityOfHawaiiORS/rice,ewestfal/rice,kuali/kc-rice,bhutchinson/rice,jwillia/kc-rice1,smith750/rice,shahess/rice,bsmith83/rice-1,gathreya/rice-kc,bhutchinson/rice,sonamuthu/rice-1,cniesen/rice,jwillia/kc-rice1,rojlarge/rice-kc,geothomasp/kualico-rice-kc,smith750/rice,geothomasp/kualico-rice-kc,gathreya/rice-kc,geothomasp/kualico-rice-kc,bhutchinson/rice,shahess/rice,cniesen/rice,UniversityOfHawaiiORS/rice,gathreya/rice-kc,UniversityOfHawaiiORS/rice,geothomasp/kualico-rice-kc,ewestfal/rice,smith750/rice,bhutchinson/rice,jwillia/kc-rice1,rojlarge/rice-kc,cniesen/rice,bsmith83/rice-1,jwillia/kc-rice1,gathreya/rice-kc,UniversityOfHawaiiORS/rice,bhutchinson/rice,sonamuthu/rice-1,geothomasp/kualico-rice-kc,ewestfal/rice,UniversityOfHawaiiORS/rice,rojlarge/rice-kc,smith750/rice,rojlarge/rice-kc,bsmith83/rice-1,gathreya/rice-kc,bsmith83/rice-1,sonamuthu/rice-1,shahess/rice,sonamuthu/rice-1,ewestfal/rice,jwillia/kc-rice1,kuali/kc-rice,smith750/rice,shahess/rice,cniesen/rice,kuali/kc-rice,kuali/kc-rice,cniesen/rice,rojlarge/rice-kc