HomeKit Beta release 1
Solve conflict