finished up load balancer
fixed merge