Resolve conflict merge as well as review pipeline changes

[anupama.gangadhar]

Pretty Json and Diff is not available readily so when we need to resolve merge conflicts it is quite a challenge. Any best practises to follow to ensure changes are reviewed correctly and merge is complete