Removed confliction files with wordpress base