Resolve merge conflicts with ease and consistency

Share with