root and homectrl
index merge conflict
index merge conflict