method
fix merge