tidy before merge