fix(merge): remove merge conflict