Manage merge conflicts after downloading the reposotory in other computer