Fix error from merge