Add Conflict f2 Netbeans