Starting Over Again, the merge did not go well. My changes were backed up, so I will just start from here.