> I don't want to hang this stuff off my own repo, so I will > start over and do it as a merge instead of rebase. Ha. Well, that gave me about a 100 conflict files, which is interesting since there are only 8 files in the aptui branch that are actually different. Which raises the question of why we are using a branch for these 8 files, that don't even exist in master anyway. Lbs