adjust gap image homepage
arrange merge conflict