I want to say goodbye instead
Resolve merge conflict