merged brad hunstable i completed the merge