adds goodby Tony
resolves merge conflicts