[#7894] Fix issue where can_merge updated mod_date
3 files changed