reformat
working date filter
resolve conflicts