fixed a timer for finishing the game, and almost fixed the whole landscape mode
fixed conflicts
merging and fixing conflicts again