.gitignore is now working
Working on binary conflicts