removed conflict text from files, new .gitignore