removed exessfiles
fixed conflict .gitignore