Moved Permanently. Redirecting to /articles/resolving-a-merge-conflict-on-github