fixed b0rken .gitignore merge