https://polynomeer.github.io/posts/resolve-git-conflicts/