opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
@@ -427,10 +427,8 @@ { testSetUp("modifyConflicts"); final DN dn1 = DN.valueOf("cn=test1," + baseDN); final AttributeType attrType = DirectoryServer.getAttributeType("displayname"); final AttributeType entryuuidType = DirectoryServer.getAttributeType("entryuuid"); final AttributeType attrType = DirectoryServer.getAttributeTypeOrNull("displayname"); final AttributeType entryuuidType = DirectoryServer.getAttributeTypeOrNull("entryuuid"); String monitorAttr = "resolved-modify-conflicts"; /*