This is the area where the merge conflict was at.