unpleasant merge