git pull to update
unmerged files error