bug fix banner module n clear upload images
solve merge conflict api