fixed conflicts

git-svn-id: https://plugins.svn.wordpress.org/mainwp-child/trunk@824967 b8457f37-d9ea-0310-8a92-e5e31aec5664
new version

git-svn-id: https://plugins.svn.wordpress.org/mainwp-child/trunk@825010 b8457f37-d9ea-0310-8a92-e5e31aec5664