changed upstream, and branch in lamp