Fixed up conway life game
fixed merge