gitignore and redmine.iml
merge conflicts with gitignore