Conflict 1

Making sure I understand what I'm doing