Gerrit and Jenkins: merge conflict vs. +1 Verified