finished player bar
fix merge conflict