Fixed gitignore merge commit conflicts from anqi.