fix(merge): fix merge conflicts