Added git ignore file
Fixed merge conflict