Added dateEdit and the possibility to merge months
conflict fix