Fixing conflicts caused by merging in master with eslint changes

fix-conflicts.sh

git checkout master
git pull
git checkout my-branch
git rebase master 

# Get conflicts, flip a table.
#  (╯°□°）╯︵ 

git checkout . --theirs # we don't care about what's in master, we just want our files and we'll fix eslint errors ourselves
./node_modules/.bin/eslint . --fix

# Do a little spot checking at this point to make sure you don't have semi-colons.

git add .
git rebase --continue