Conflicts can occur any time you attempt to merge or integrate (in a very general sense) changes from the repository into your working copy. Bring your working copy up to date with the repository by merging all the changes made since your last update into your working copy. then Review any conflicts

There are several different ways to resolve conflicts interactively—either to selectively merge and edit changes, or  simply pick a version of the file and move along.