add new text
add new text
add new text
resolve merge conflict
added notes, completed coding
added notes, completed coding
idea
pre-release