solved conflict
path rebrand