Fixed versioning issues with merge code for WP7