# Conflicts:
#	src/ale/python/registration.py

# Conflicts:
#	docs/_scripts/environment-docs.json
#	docs/_scripts/gen_environments_md.py
#	docs/environments/amidar.md
#	docs/environments/assault.md
#	docs/environments/asterix.md
#	docs/environments/asteroids.md
#	docs/environments/atlantis.md
#	docs/environments/atlantis2.md
#	docs/environments/backgammon.md
#	docs/environments/bank_heist.md
#	docs/environments/basic_math.md
#	docs/environments/battle_zone.md
#	docs/environments/beam_rider.md
#	docs/environments/berzerk.md
#	docs/environments/blackjack.md
#	docs/environments/bowling.md
#	docs/environments/boxing.md
#	docs/environments/breakout.md
#	docs/environments/carnival.md
#	docs/environments/casino.md
#	docs/environments/centipede.md
#	docs/environments/chopper_command.md
#	docs/environments/crazy_climber.md
#	docs/environments/crossbow.md
#	docs/environments/darkchambers.md
#	docs/environments/defender.md
#	docs/environments/demon_attack.md
#	docs/environments/donkey_kong.md
#	docs/environments/double_dunk.md
#	docs/environments/earthworld.md
#	docs/environments/elevator_action.md
#	docs/environments/enduro.md
#	docs/environments/entombed.md
#	docs/environments/et.md
#	docs/environments/fishing_derby.md
#	docs/environments/flag_capture.md
#	docs/environments/freeway.md
#	docs/environments/frogger.md
#	docs/environments/frostbite.md
#	docs/environments/galaxian.md
#	docs/environments/gopher.md
#	docs/environments/gravitar.md
#	docs/environments/hangman.md
#	docs/environments/haunted_house.md
#	docs/environments/hero.md
#	docs/environments/human_cannonball.md
#	docs/environments/ice_hockey.md
#	docs/environments/jamesbond.md
#	docs/environments/journey_escape.md
#	docs/environments/kaboom.md
#	docs/environments/kangaroo.md
#	docs/environments/keystone_kapers.md
#	docs/environments/king_kong.md
#	docs/environments/klax.md
#	docs/environments/koolaid.md
#	docs/environments/krull.md
#	docs/environments/kung_fu_master.md
#	docs/environments/laser_gates.md
#	docs/environments/lost_luggage.md
#	docs/environments/mario_bros.md
#	docs/environments/miniature_golf.md
#	docs/environments/montezuma_revenge.md
#	docs/environments/mr_do.md
#	docs/environments/ms_pacman.md
#	docs/environments/name_this_game.md
#	docs/environments/othello.md
#	docs/environments/pacman.md
#	docs/environments/phoenix.md
#	docs/environments/pitfall.md
#	docs/environments/pitfall2.md
#	docs/environments/pong.md
#	docs/environments/pooyan.md
#	docs/environments/private_eye.md
#	docs/environments/qbert.md
#	docs/environments/riverraid.md
#	docs/environments/road_runner.md
#	docs/environments/robotank.md
#	docs/environments/seaquest.md
#	docs/environments/sir_lancelot.md
#	docs/environments/skiing.md
#	docs/environments/solaris.md
#	docs/environments/space_invaders.md
#	docs/environments/space_war.md
#	docs/environments/star_gunner.md
#	docs/environments/superman.md
#	docs/environments/surround.md
#	docs/environments/tennis.md
#	docs/environments/tetris.md
#	docs/environments/tic_tac_toe_3d.md
#	docs/environments/time_pilot.md
#	docs/environments/trondead.md
#	docs/environments/turmoil.md
#	docs/environments/tutankham.md
#	docs/environments/up_n_down.md
#	docs/environments/venture.md
#	docs/environments/video_checkers.md
#	docs/environments/video_chess.md
#	docs/environments/video_cube.md
#	docs/environments/video_pinball.md
#	docs/environments/wizard_of_wor.md
#	docs/environments/word_zapper.md
#	docs/environments/yars_revenge.md
#	docs/environments/zaxxon.md