fix the error
fix merge comflicts