Resolve merge conflicts
Implement database.player.init()