fixed server, setup two branches, port forwarding done