add home, resolve conflict