adding game files
resolving conflicts