pid
fixed merge conflicts
that pid file is really annoying
fixed conflicting log file