danny's version merged logs need to be fixed