Revert "fix conflict Users"

This reverts commit 0e65e7aa1bbcec801d0b53865270f11556aea51d.
upload anh và ckeditor
edit painting
á

ddadấd