fix merge && clean code