fake commit
fixup bad merge
Check for running server before running new server