fix merge, add detail to readme
finish api template
my merge is finish api template