fix format,remove interval
fix merge