conflict in the hp
deal with conflict in hp 1