Fixed broken merge problems
Moved the Bg1