nothing has changed
Modified .gitignore to stop tracking binary files and fixed merge conflicts