merged wp1-2 wp-2