Changed game imp.
Merged conflict