fix merge, run indent