merge
remove netbeans dir