Newly generated NetBeansProject file.
Resolved git conflicts.
Coflicts fully resolved.