Fixed old merge conflict in client application's .gitignore