Betty's adding a new line
Fixing merge conflicts