why i am getting these merge conflict
Explain Your Query in more detail or look for references
This file contains the module_id which is different than the previous one, so merge conflict arises.
Eg: “module_id”: “ME_QBOX_MODULE_SERVER_CONFIGURATION”
Since this is module 2, you can harmlessly accept the incoming changes, commit them and keep on working.