aad git ignore file
creating conflict
fix conflict