Line 12 of the arc script throws the error, e.g.: `style(Shoes::Arc, fill: white)` which probably gets the app and which then has weird behavior... would need to investigate further.

3.) git pull upstream/master does not do that. If you are on master (or even if you aren't not 100pro sure atm) it updates your master branch. What you could do is: 

```
git checkout master
git pull upstream master
git checkout style_method
git merge master
```

There should not be merge conflicts so it should be relatively safe atm, given your master is clean. As long as you don't do a force push we'd be able to get stuff straight even if that messes things up (jay incremental updates + full history)