message layout
merge conflict removed