addslashes and stripslashes
fixe merge conflict