Changed .gitignore
Resolved confilcts