go ahead and merge what you think is necessary i'll review your edits and create a redirect timecop