Resolved conflicts .gitignore
Resolve conflict