Add goodbye line
Resolve merge conflict