split player screens
fixed merge conflicts