fixed more merge issues

haaaaaalp