Fix to date end match for conflict detect