Finishing merge conflicts with time range filter