dont restart server unnecessarily
merge