3rd step: Solve merge conflicts.

Author: Mrcel97

src/index.js

@@ -6,6 +6,7 @@ class Game extends React.Component {
     winner;
     history;
     current;
+    winnerLine;
 
     constructor(props) {
         super(props);