Fixed errors after bad merge