Merge WP7 and WP8