Fixed merge conflict on googleappenginego.rb