neyyar/express_server/app/services/queryBuilder.service.js: needs merge code example Example: git error needs merge git reset --merge