merge
message changed