ignore node_modules
fixed conflict