What is this change doing in here? Is it from a merge?