Revert conflicting files.