merge conflict; take your changes for a specific file. #git