bad merge demo reset!