fix(merge): merge conflict mess