admin modify js
admin merge conflict
merge conflict solved