tests: Fix conflict resolution error
tests: Fix conflict resolution error

Signed-off-by: Michael Adam <dcf2bf3ff8ea93047d51252815aac9756207ea09@redhat.com>

gluster/gluster-kubernetes,gluster/gluster-kubernetes