#1038 In activity log player is able to differnciate between time and activity
 conflicts fixed