Fix merge conflict, Eric.