fixing the last merge that wasn't well succeeded