fix: merge conflicts.

Signed-off-by: DivyPatel9881 <[email protected]>

Author: divy9881

README.md

@@ -8,6 +8,13 @@ Casbin-CPP
 
 **News**: Are you still worried about how to write the correct Casbin policy? ``Casbin online editor`` is coming to help! Try it at: http://casbin.org/editor/
 
+## Build Availability on Platforms:
+Operating Systems | Availability status
+----------------- | -------------------
+Windows (VS C++)  | :heavy_check_mark: Available
+Linux and MacOS   | :wrench: Under-Development
+
+
 ![casbin Logo](casbin-logo.png)
 
 ## All the languages supported by Casbin:
@@ -130,7 +137,6 @@ Note: you can also initialize an enforcer with policy in DB instead of file, see
     vector<string> roles( e->GetImplicitRolesForUser(sub) );
     ```
 
-
 ## Policy management
 
 Casbin provides two sets of APIs to manage permissions: