There is a still a difference in one or more of your src files. If you look through your files and you see somewhere in them something along the lines of ------>mine that means your code and your oartners code are mixed in that file. You need to decide on which version of the code you want to use.
-Timothy Crisler