dates around work
merge the conflict