gitignore binary files, attempting to resolve merge conflicts