player version progress
solving merging conflicts