git ignore change to ignore node_modules
another gitignore update
fixed conflicts, merged files
fixed conflicts
merge finished