fix log interface
fix merge error