Added goodbye statement
Fixed merge conflicts