HIB

Conflicts and HIB