Fixing the binary conflicts
Adding the .gitignore file