finish the view of article app
fix conflics before push