adding game of life
manual merge