fix mistake from merge