#REMEMBER TO USE git status IF YOU GET LOST. AND IF YOU DON'T GET LOST.
###QUICK AND DIRTY
git checkout your-branch-that-has-changes
git fetch citrondigital
git merge citrondigital/participants
git push -f origin your-branch-that-has-changes
###PROPER WAY
git checkout your-branch-that-has-changes
git fetch citrondigital
git rebase citrondigital/participants
fix all the changes, follow the rebase instructions
git add
git rebase --continue
git push -f origin your-branch-that-has-changes