These are two great habits that help merge conflict issues when working in TFS.
#1 When you get latest and then you check out files to start coding in, always look back and see if the project or even the solution file has been checked out. As many know,