finish phase1 task1 and pass joinGrader
add preview1 to prevent confilct
resolve conflicts