ignore bundle, npm-debug
fixed conflicts