We have recently installed Team Explorer client for 2005 and TFS server 2008.. We have been using VS2005 and VSS earlier. To connect to TFS server 2008 we have installed a hotfix VS80sp1-KB932544-X86-ENU.exe. Everything has been setup well. However I noticed that when the files are checked out and u make some modifications , during checking in resolve confict dialog box asking to merge changes done by others isn't appearing. Instead the file is getting checked in overwriting the changes done by others. Is there some setting that needs to be done on TFS server 2008? Kindly help.