consolidate checkins and rename files