Merge with Game Branch