prevent two instances from running by one user

Signed-off-by: Mattias Andrée <maandree@operamail.com>
resolve trivial merge conflict

Signed-off-by: Mattias Andrée <maandree@operamail.com>