latest entry merge and fix