the dreaded merge