Fixed errors from merge