bring back apollo
bring back terminal

Conflicts:

	config/common.mk