fixed player view bug
merging