used system function to get milli secs
used system function to get millisecs
fixing conflict
Merge branch 'changeComparingClasses'