Bad merge left a duplicate function definition