Advisor defined
Solved conflicts