removed junk
fixed conflict in .gitignore