the nbproject folder should be added to the .gitignore file. If anyone else is using netbeans it will lead to conflicts down the line.