added note on merge
modified some message.