added phoomatics to updateRegistry
fixed merge conflicts