added gitignore in paper
conflict