Fixed the merge diff that had overwritten the original 'convDate.py'