merging gameplay branch