Testing .gitignore
Resolve merge conflict