first pass
fixing merge