fix merge conflict and bug fix