add page 3 and 4
add courusel
resolve conflicts