When there is a conflict in the project code, have a solid understanding of not only how to merge code from one source file to another, but understand how your merging tool functions.