Saved stuff before pulling.
Pulled in new changes.
Fixed all the things.