check if conflicts are solved
Merge branch 'master' of https://github.com/gunnaroh11/BoardGames