you need to resolve your current index first src/components/WalktroughComponent.js: needs merge code example Example: git error needs merge git reset --merge