Finished Footer  editor and Carousel editor
solved merge errors