initial for changing out crisis (still buggy)
Merge remote-tracking branch 'origin/master'