Fix conflicts

Conflicts:
	src/constants.py
	src/lava.py
	src/level.py
	src/main.py