Merge conflict issue

can’t get which module id to keep in metadata.json while pulling the repo

If you’re in the 3rd module, please accept an incoming change of client and server

okk I have kept the incoming change that is module id of client and server

just accept incoming change and then
***git add /filename ***
git commit -m "message"