adding library isoweek
cleaning conflicts