Two developers modified the same function, causing a multi-line conflict. Fix the conflict properly and complete the merge.