Now tells you who's turn it is
Fixing merge conflicts