Add Conflict Netbeans