error: You have not concluded your merge (MERGE_HEAD exists). git fetch --all git reset --hard origin/master git fetch