New changes about integration test. It is running fine, need to test the remaining operations and fix any problem related
Conflict during the pull from origin/master