wqs psuedo-merge again