Actually fixed all the errors now

Fixed errors caused by merge