diff --git a/TrackingStatus.txt b/TrackingStatus.txt
index 5106e0c1c1bd42bc4f11768ff780f95542a0cbc3..2f3ca2e631b3d2864f2197fae8d055be1e522a79 100644
--- a/TrackingStatus.txt
+++ b/TrackingStatus.txt
@@ -29,50 +29,26 @@ SOL003
 
   - VNFIndicatorNotification-API_nxw ------------------------> [NOT STARTED]
 
-<<<<<<< .merge_file_a05540
-  - VNFLifecycleManagement-API_egm  ----------------------------> [ONGOING]
-    * VNFInstances --------------------------------------> [DONE]
-    * IndividualVNFInstance --------------------------------------> [DONE]
-    * InstantiateVNFTask --------------------------------------> [DONE]
-    * ScaleVNFTask --------------------------------------> [DONE]
-    * ScaleVNFToLevelTask --------------------------------------> [DONE]
-    * ChangeVNFFlavourTask  ----------------------------> [DONE]
-    * TerminateVNFTask  ----------------------------> [DONE]
-    * HealVNFTask  ----------------------------> [DONE]
-    * OperateVNFTask  ----------------------------> [DONE]
-    * ChangeExternalVNFConnectivityTask  ----------------------------> [DONE]
-    * VnfLcmOperationOccurences  ----------------------------> [ONGOING]
-    * IndividualVnfLcmOperationOccurence  ----------------------------> [ONGOING]
-    * RetryOperationTask  ----------------------------> [ONGOING]
-    * RollbackOperationTask  ----------------------------> [ONGOING]
-    * FailOperationTask  ----------------------------> [ONGOING]
-    * CancelOperationTask  ----------------------------> [ONGOING]
-    * Subscriptions  ----------------------------> [ONGOING]
-    * IndividualSubscription  ----------------------------> [ONGOING]
-    * NotificationEndpoint  ----------------------------> [ONGOING]
-=======
-  - VNFLifecycleManagement-API_egm  -------------------------> [ONGOING]
+  - VNFLifecycleManagement-API_egm  -------------------------> [DONE] // with request content to be specified 
     * VNFInstances ----------------------------------------------> [DONE]
     * IndividualVNFInstance -------------------------------------> [DONE]
     * InstantiateVNFTask ----------------------------------------> [DONE]
     * ScaleVNFTask ----------------------------------------------> [DONE]
     * ScaleVNFToLevelTask ---------------------------------------> [DONE]
-    * ChangeExternalVNFConnectivityTask  ------------------------> [ONGOING]
-    * TerminateVNFTask  -----------------------------------------> [ONGOING]
-    * HealVNFTask  ----------------------------------------------> [ONGOING]
-    * OperateVNFTask  -------------------------------------------> [ONGOING]
-    * ChangeExternalVNFConnectivityTask  ------------------------> [ONGOING]
-    * VnfLcmOperationOccurences  --------------------------------> [ONGOING]
-    * IndividualVnfLcmOperationOccurence  -----------------------> [ONGOING]
-    * RetryOperationTask  ---------------------------------------> [ONGOING]
-    * RollbackOperationTask  ------------------------------------> [ONGOING]
-    * FailOperationTask  ----------------------------------------> [ONGOING]
-    * CancelOperationTask  --------------------------------------> [ONGOING]
-    * Subscriptions  --------------------------------------------> [ONGOING]
-    * IndividualSubscription  -----------------------------------> [ONGOING]
-    * NotificationEndpoint  -------------------------------------> [ONGOING]
->>>>>>> .merge_file_a03296
-    
+    * ChangeExternalVNFConnectivityTask  ------------------------> [DONE]
+    * TerminateVNFTask  -----------------------------------------> [DONE]
+    * HealVNFTask  ----------------------------------------------> [DONE]
+    * OperateVNFTask  -------------------------------------------> [DONE]
+    * ChangeExternalVNFConnectivityTask  ------------------------> [DONE]
+    * VnfLcmOperationOccurences  --------------------------------> [DONE]
+    * IndividualVnfLcmOperationOccurence  -----------------------> [DONE]
+    * RetryOperationTask  ---------------------------------------> [DONE]
+    * RollbackOperationTask  ------------------------------------> [DONE]
+    * FailOperationTask  ----------------------------------------> [DONE]
+    * CancelOperationTask  --------------------------------------> [DONE]
+    * Subscriptions  --------------------------------------------> [DONE]
+    * IndividualSubscription  -----------------------------------> [DONE]
+    * NotificationEndpoint  -------------------------------------> [DONE]
 
   - VNFLifecycleOperationGranting-API_egm -------------------> [NOT STARTED]