cleanup tipjar
cleanup merge