Completed merge and formatting.  Need to finish test refactor