fixed failed merge, messagelist formatting progress