update ipsum in note
fixing merge conflicts