Add gulp-plumber to handle errors in pipe
Add uncommitted items
Resolve conflicts