This is also probably from merge conflict, please update you version to newest and then apply your changes