add a file : about
conflict fixed in about