Gerrit/resolve conflict