Add Conflict f2 lines Netbeans