if I try to pull from origin this error I got: fatal: refusing to merge unrelated histories and I tried this code also git pull upstream branch --allow-unrelated-histories then I got conflict. Automatic merge failed; fix conflicts and then commit the result