Updating load balancer
pulled in changes, fixed conflict