messages was still broken. fixed now.
testmerge