Fix no merge warning + fix modification date

parent 5e2e4def
Pipeline #221 passed with stages