add wp-admin, and site links, and dev site
fix conflicts