netbeans-generated Application code
resolve conflicts