URL Jump to
https://ubuntuask.com/blog/how-to-resolve-merge-conflicts-in-git