Now it is possible to add date to match
resolve conlicts