bad merge demo preperation