Yes, these were the merge conflict lines! Fixing.