Chapter 8 finish sign in no cucumber
merging branch conflicts