- no clue what changes are these, just comming back from vacation and net beans shows some conflicts, I need to commit