added GoTo environment and a small merge util fix