Jon added Nicole's photo back so I had to pull again but forgot to push my previous commit when I changed the officers JSON and now git wants to merge the two
Jon added Nicole's photo back so I had to pull again but forgot to push my previous commit when I changed the officers JSON and now git wants to merge the two

WhiteHatCP/thewhitehat.club,WhiteHatCP/thewhitehat.club,WhiteHatCP/thewhitehat.club