Fixed git conflict with master.php in cache & w3tc folders.

Signed-off-by: Dom Pascal <dom@dompascal.com>