hideous merge