chapter 7 practice
Finish sign in
Fix CONFLICT
Fix CONFLICT