Fix conflict resolution

The deleted line came from a conflict from a non reintegrated branch