Fix .gitignore (merging artifacts)