What the heck why isn't this merge conflict thing getting deleted?!
What the heck why isn't this merge conflict thing getting deleted?!

adnanhemani/enrollme,adnanhemani/enrollme,DerekHs/enrollme,colinschoen/enrollme,colinschoen/enrollme,DerekHs/enrollme,adnanhemani/enrollme,colinschoen/enrollme,DerekHs/enrollme