implemented getWeek
merging