merging complete

this was the best i could do to merge...