chapter 11 and my nerves done.
Git merge crash