added holidays and fixed a bug
conflict?