The best way to resolve issues like this, is by using the "Team Synchronizing"-perspective. After the synchronization you can see exactly which files/changes are incomming, which are outgoing and which are conflicting. You can then resolve conflicts by right-clicking on them and selecting on of the appropriate options. In your case "Mark as merged" would do the trick.
Lead Developer and CTO
If your problem has been resolved or if you've found your own solution, please let us know! Adding that final post will greatly increase the quality of the information you find here and will help many other users.