So, this is a merge conflict -- you need to resolve the conflict (by choosing one and deleting the other).