checking in updates from the WP site server
fix merge conflict