added endgame
merge
solved conflics