Fixed error from merge