remove files from previous merge resolution
add period (quarter, half, etc) info to stats