fixed weird merge, added dead and alive to makefile