Fix merge conflict r.e. latest_summary