Recovered modifications of heatmanager, nmanager modules overwritten during rebase.