fix json of notification put
merge
Merge branch 'merge'