Updated .gitignore
Fixed incorrect merge start with multiple slices