fix merge erors