hevele-moda

# 1. First pull latest master and yarn install
git checkout master
git pull origin master
yarn install

# 2. Check out your branch and rebase it on the commit before prettier
git checkout <YOUR_BRANCH>
git rebase --onto e96854efabfc690c9b5665129a9c7d54dcb8e282 master
# Fix any conflicts (these will NOT be related to prettier formatting)