Add CreateIdenticalParentContentRevisions Test and reorganize conflict tests

* Added CreateIdenticalParentContentRevisions Test

* Created Conflict Test section and move conflict Tests together

* Add API_Conflict, API_Resolve_Conflict, and API_CreateIdenticalParentContentRevisions to TestCase(API)