Resolve conflicts with restart policies

Signed-off-by: Tibor Vass <teabee89@gmail.com>